Allow a -1 icon size.

2002-01-30  Anders Carlsson  <andersca@gnu.org>

	* gtk/gtkstyle.c (gtk_default_render_icon): Allow a -1 icon size.

diff --git a/ChangeLog b/ChangeLog
index 246a36c0cb7ee8c5cc87dd5bfac70ab6032e379d..2f65e52d83a093af0614403086c5853b8fd01b34 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-30  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtkstyle.c (gtk_default_render_icon): Allow a -1 icon size.
+
 Wed Jan 30 20:29:01 2002  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkscale.c (gtk_scale_set_digits): fix revrted bug fix.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 246a36c0cb7ee8c5cc87dd5bfac70ab6032e379d..2f65e52d83a093af0614403086c5853b8fd01b34 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+2002-01-30  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtkstyle.c (gtk_default_render_icon): Allow a -1 icon size.
+
 Wed Jan 30 20:29:01 2002  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkscale.c (gtk_scale_set_digits): fix revrted bug fix.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 246a36c0cb7ee8c5cc87dd5bfac70ab6032e379d..2f65e52d83a093af0614403086c5853b8fd01b34 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+2002-01-30  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtkstyle.c (gtk_default_render_icon): Allow a -1 icon size.
+
 Wed Jan 30 20:29:01 2002  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkscale.c (gtk_scale_set_digits): fix revrted bug fix.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 246a36c0cb7ee8c5cc87dd5bfac70ab6032e379d..2f65e52d83a093af0614403086c5853b8fd01b34 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+2002-01-30  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtkstyle.c (gtk_default_render_icon): Allow a -1 icon size.
+
 Wed Jan 30 20:29:01 2002  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkscale.c (gtk_scale_set_digits): fix revrted bug fix.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 246a36c0cb7ee8c5cc87dd5bfac70ab6032e379d..2f65e52d83a093af0614403086c5853b8fd01b34 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+2002-01-30  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtkstyle.c (gtk_default_render_icon): Allow a -1 icon size.
+
 Wed Jan 30 20:29:01 2002  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkscale.c (gtk_scale_set_digits): fix revrted bug fix.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 246a36c0cb7ee8c5cc87dd5bfac70ab6032e379d..2f65e52d83a093af0614403086c5853b8fd01b34 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+2002-01-30  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtkstyle.c (gtk_default_render_icon): Allow a -1 icon size.
+
 Wed Jan 30 20:29:01 2002  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkscale.c (gtk_scale_set_digits): fix revrted bug fix.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 246a36c0cb7ee8c5cc87dd5bfac70ab6032e379d..2f65e52d83a093af0614403086c5853b8fd01b34 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+2002-01-30  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtkstyle.c (gtk_default_render_icon): Allow a -1 icon size.
+
 Wed Jan 30 20:29:01 2002  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkscale.c (gtk_scale_set_digits): fix revrted bug fix.

diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index b4307301716b29a07e019bd785a545e76fdf5a42..a88765196a75ad4a4e1f0f365e23d1aee30ecd0a 100644 (file)
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -1900,7 +1900,7 @@ gtk_default_render_icon (GtkStyle            *style,
 
   g_return_val_if_fail (base_pixbuf != NULL, NULL);
   
-  if (!gtk_icon_size_lookup (size, &width, &height))
+  if (size != (GtkIconSize) -1 && !gtk_icon_size_lookup (size, &width, &height))
     {
       g_warning (G_STRLOC ": invalid icon size `%d'", size);
       return NULL;